Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

Various fixes and changes to Firefox toolbar button - #2009

Closed
fuglede wants to merge 12 commits into
EFForg:masterfrom
fuglede:counter-port
Closed

fuglede wants to merge 12 commits into
EFForg:masterfrom
fuglede:counter-port

Conversation

@fuglede

@fuglede fuglede commented Jun 27, 2015

Copy link
Copy Markdown
Contributor

As an extension of #1035, this adds the option to display the total number of applicable rulesets on a given site, rather than just the active ones. For users who don't mind breakage, this has the advantage of easily identifying the opportunity to use less-than-optimal rulesets.

I didn't play around with this code before, so apologies in advance if things are messier than they should be. On the other hand, I did clean up a few very minor things myself.

Note: There is one hardcoded string in this PR that should get fixed. After seeing #1778, though, it is not entirely clear to me how to match up the locales with Transifex optimally; should the string be added (in English) to all .dtd's manually -- or what can be automated in this? Localisation added in third commit.

@fuglede fuglede changed the title Include option to show total rule count in Firefox Various fixes and changes to Firefox toobar button Jun 30, 2015
Comment thread src/chrome/content/toolbar_button.js Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suspect this can return undefined, or may in the future if Firefox changes its XUL. We should check the result of getElementById before dereferencing .palette.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. I guess one could also check if palette itself is undefined afterwards.

@jsha

jsha commented Jul 3, 2015

Copy link
Copy Markdown
Member

Other than those two comments, looks good. @diracdeltas was going to double-check the appearance on OS X, since we've had some OS X display issues with the counter in the past.

@fuglede

fuglede commented Jul 3, 2015

Copy link
Copy Markdown
Contributor Author

Actually, it had three (rather than two) appearances. I suppose that's an argument for abstraction.

@fuglede fuglede changed the title Various fixes and changes to Firefox toobar button Various fixes and changes to Firefox toolbar button Aug 21, 2015
Conflicts:
	src/chrome/locale/ar/https-everywhere.dtd
	src/chrome/locale/bg/https-everywhere.dtd
	src/chrome/locale/ca/https-everywhere.dtd
	src/chrome/locale/cs/https-everywhere.dtd
	src/chrome/locale/da/https-everywhere.dtd
	src/chrome/locale/de/https-everywhere.dtd
	src/chrome/locale/el/https-everywhere.dtd
	src/chrome/locale/en/https-everywhere.dtd
	src/chrome/locale/en_GB/https-everywhere.dtd
	src/chrome/locale/es/https-everywhere.dtd
	src/chrome/locale/et/https-everywhere.dtd
	src/chrome/locale/eu/https-everywhere.dtd
	src/chrome/locale/fa/https-everywhere.dtd
	src/chrome/locale/fi/https-everywhere.dtd
	src/chrome/locale/fo/https-everywhere.dtd
	src/chrome/locale/fr/https-everywhere.dtd
	src/chrome/locale/fr_CA/https-everywhere.dtd
	src/chrome/locale/he/https-everywhere.dtd
	src/chrome/locale/hr_HR/https-everywhere.dtd
	src/chrome/locale/hu/https-everywhere.dtd
	src/chrome/locale/it/https-everywhere.dtd
	src/chrome/locale/ja/https-everywhere.dtd
	src/chrome/locale/km/https-everywhere.dtd
	src/chrome/locale/ko/https-everywhere.dtd
	src/chrome/locale/lt/https-everywhere.dtd
	src/chrome/locale/lv/https-everywhere.dtd
	src/chrome/locale/ms_MY/https-everywhere.dtd
	src/chrome/locale/nb/https-everywhere.dtd
	src/chrome/locale/nl/https-everywhere.dtd
	src/chrome/locale/pl/https-everywhere.dtd
	src/chrome/locale/pt/https-everywhere.dtd
	src/chrome/locale/pt_BR/https-everywhere.dtd
	src/chrome/locale/ro/https-everywhere.dtd
	src/chrome/locale/ru/https-everywhere.dtd
	src/chrome/locale/si_LK/https-everywhere.dtd
	src/chrome/locale/sk/https-everywhere.dtd
	src/chrome/locale/sk_SK/https-everywhere.dtd
	src/chrome/locale/sl/https-everywhere.dtd
	src/chrome/locale/sl_SI/https-everywhere.dtd
	src/chrome/locale/sq/https-everywhere.dtd
	src/chrome/locale/sr/https-everywhere.dtd
	src/chrome/locale/sv/https-everywhere.dtd
	src/chrome/locale/th/https-everywhere.dtd
	src/chrome/locale/tr/https-everywhere.dtd
	src/chrome/locale/uk/https-everywhere.dtd
	src/chrome/locale/zh-CN/https-everywhere.dtd
	src/chrome/locale/zh_TW/https-everywhere.dtd
@semenko

semenko commented Dec 17, 2015

Copy link
Copy Markdown
Contributor

@fuglede Sorry this didn't end up getting merged before a conflict -- if you'd like to update it, i'd be happy to merge it.

@fuglede

fuglede commented Dec 17, 2015

Copy link
Copy Markdown
Contributor Author

I'll see if I can get around to that at some point. Great job on the review spree though!

@semenko

semenko commented Dec 17, 2015

Copy link
Copy Markdown
Contributor

Thanks! 👍

Conflicts:
	https-everywhere-checker
	src/chrome/content/toolbar_button.js
Resolved manually.
@fuglede

fuglede commented Jan 18, 2016

Copy link
Copy Markdown
Contributor Author

Fingers crossed.

@fuglede

fuglede commented Jan 18, 2016

Copy link
Copy Markdown
Contributor Author

Okay, the merge was trivial enough, but something else has changed, as now the button is gone altogether. I don't quite have an overview of why that could be, but perhaps #3727 is related?

@cowlicks

Copy link
Copy Markdown
Contributor

Closing since we've moved to webextensions. @fuglede let me know if you'd like to re-open this.

@cowlicks cowlicks closed this Sep 15, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants